socket: Don't include gtk.h

And fix remaining headers to not emit warnings

diff --git a/gtk/gtkplug.c b/gtk/gtkplug.c
index c45b31b2aa05cfff4f503040923c54d016b15901..7f68e0a2fec160711a85ade0ee734e7e851137da 100644 (file)
--- a/gtk/gtkplug.c
+++ b/gtk/gtkplug.c
@@ -34,6 +34,7 @@
 #include "gtkprivate.h"
 #include "gtksocketprivate.h"
 #include "gtkwidgetprivate.h"
+#include "gtkwindowgroup.h"
 #include "gtkwindowprivate.h"
 #include "gtkxembed.h"
 

diff --git a/gtk/gtkplug.h b/gtk/gtkplug.h
index 43c00eaa35698cc241666154f34bfb341e419cfb..1a2c1651ef9a8fdac41cbc8011522e11b43ae2e4 100644 (file)
--- a/gtk/gtkplug.h
+++ b/gtk/gtkplug.h
@@ -36,7 +36,7 @@
 #include <gdk/gdkx.h>
 
 #include <gtk/gtksocket.h>
-
+#include <gtk/gtkwindow.h>
 
 G_BEGIN_DECLS
 

diff --git a/gtk/gtksocket.h b/gtk/gtksocket.h
index abd9bade746a22eb4290fee15508a8c19329ee35..ec22ba133794f618238e96f1b2438da406b773ee 100644 (file)
--- a/gtk/gtksocket.h
+++ b/gtk/gtksocket.h
@@ -29,12 +29,12 @@
 #error "Only <gtk/gtkx.h> can be included directly."
 #endif
 
-#include <gtk/gtk.h>
-
 #ifdef GDK_WINDOWING_X11
 
 #include <gdk/gdkx.h>
 
+#include <gtk/gtkcontainer.h>
+
 G_BEGIN_DECLS
 
 #define GTK_TYPE_SOCKET            (gtk_socket_get_type ())

diff --git a/gtk/gtkx.h b/gtk/gtkx.h
index 4033d5d28e13b9ca440b6f023304ea09b6146164..10f3dfaedc5e78776b04c6a42cde56dbab140d3a 100644 (file)
--- a/gtk/gtkx.h
+++ b/gtk/gtkx.h
@@ -20,6 +20,8 @@
 
 #define __GTKX_H_INSIDE__
 
+#include <gtk/gtk.h>
+
 #include <gtk/gtksocket.h>
 #include <gtk/gtkplug.h>